stupid bug where I didn't reset the timer.

Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
	didn't reset the timer.

diff --git a/ChangeLog b/ChangeLog
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 02fc60a6d81c75009336eeed91c28218eb6a790a..ac7e08e4371a7b85db746b0a6fc4d691cc28e06a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Dec 10 19:42:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (validate_rows_handler): stupid bug where I
+       didn't reset the timer.
+
 2001-12-10  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkcontainer.c (gtk_container_child_type): Close comment.

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c1e27f0e43e04e07cb0f6434bb88e2326af2bcc4..f28d580f76aa7b2ad92fa39f9ab2a0ea878989a1 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3154,9 +3154,6 @@ validate_row (GtkTreeView *tree_view,
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) && !column->dirty)
        continue;
 
-      if (column->column_type == GTK_TREE_VIEW_COLUMN_FIXED)
-       continue;
-
       gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter,
                                               GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
                                               node->children?TRUE:FALSE);
@@ -3315,7 +3312,10 @@ validate_rows_handler (GtkTreeView *tree_view)
   GDK_THREADS_ENTER ();
 
   if (tree_view->priv->tree == NULL)
-    return FALSE;
+    {
+      tree_view->priv->validate_rows_timer = 0;
+      return FALSE;
+    }
 
   do
     {
@@ -4819,9 +4819,9 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
          gtk_tree_view_column_cell_set_dirty (column);
        }
     }
-  install_presize_handler (tree_view);
 
  done:
+  install_presize_handler (tree_view);
   if (free_path)
     gtk_tree_path_free (path);
 }
@@ -4911,9 +4911,9 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
       tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]);
       _gtk_rbtree_insert_after (tree, tmpnode, 0, FALSE);
     }
-  install_presize_handler (tree_view);
 
  done:
+  install_presize_handler (tree_view);
   if (free_path)
     gtk_tree_path_free (path);
 }